@nocobase/client-v2 2.1.0-beta.38 → 2.1.0-beta.40

package/src/collection-manager/interfaces/datetimeNoTz.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 DatetimeNoTzFieldInterface extends CollectionFieldInterface {
   name = 'datetimeNoTz';
@@ -60,7 +60,7 @@ export class DatetimeNoTzFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.datetime,
+    operators: 'datetime',
   };
   titleUsable = true;
 }

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

@@ -7,8 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
-import { defaultProps, operators, unique } from './properties';
+import { defaultProps, unique } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
 export class EmailFieldInterface extends CollectionFieldInterface {
@@ -35,13 +34,7 @@ export class EmailFieldInterface extends CollectionFieldInterface {
     unique,
   };
   filterable = {
-    operators: operators.string,
+    operators: 'string',
   };
   titleUsable = true;
-  schemaInitialize(schema: ISchema, { block }) {
-    if (['Table', 'Kanban'].includes(block)) {
-      schema['x-component-props'] = schema['x-component-props'] || {};
-      schema['x-component-props']['ellipsis'] = true;
-    }
-  }
 }

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

@@ -8,7 +8,6 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { operators } from './properties';
 
 export class IdFieldInterface extends CollectionFieldInterface {
   name = 'id';
@@ -53,7 +52,7 @@ export class IdFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.id,
+    operators: 'id',
   };
 
   description = '{{t("Primary key, unique identifier, self growth") }}';

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

@@ -20,14 +20,14 @@ export * from './id';
 export * from './input';
 export * from './integer';
 export * from './json';
-export * from './linkTo';
 export * from './m2m';
 export * from './m2o';
 export * from './markdown';
 export * from './multipleSelect';
 export * from './number';
+export * from './obo';
 export * from './o2m';
-export * from './o2o';
+export * from './oho';
 export * from './password';
 export * from './percent';
 export * from './phone';
@@ -35,7 +35,6 @@ export * from './radioGroup';
 export * from './richText';
 export * from './select';
 export * from './snowflake-id';
-export * from './subTable';
 export * from './tableoid';
 export * from './textarea';
 export * from './time';

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

@@ -7,12 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
 import { isArr, isEmpty, isValid } from '@formily/shared';
 import { registerValidateRules } from '@formily/validator';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 import { i18n } from '../../i18n';
-import { defaultProps, operators, primaryKey, unique } from './properties';
+import { defaultProps, primaryKey, unique } from './properties';
 
 const isValidateEmpty = (value: any) => {
   if (isArr(value)) {
@@ -88,137 +87,7 @@ export class InputFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.string,
+    operators: 'string',
   };
   titleUsable = true;
-  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',
-              )}' : ''}}`,
-            },
-          },
-        },
-      },
-      len: {
-        type: 'number',
-        title: '{{ t("Length") }}',
-        minimum: 0,
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-component-props': {
-          precision: 0,
-        },
-      },
-      format: {
-        type: 'string',
-        title: '{{ t("Format") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Select',
-        'x-component-props': {
-          allowClear: true,
-        },
-        enum: [
-          {
-            label: '{{ t("url") }}',
-            value: 'url',
-          },
-          {
-            label: '{{ t("email") }}',
-            value: 'email',
-          },
-          {
-            label: '{{ t("ipv6") }}',
-            value: 'ipv6',
-          },
-          {
-            label: '{{ t("ipv4") }}',
-            value: 'ipv4',
-          },
-          {
-            label: '{{ t("number") }}',
-            value: 'number',
-          },
-          {
-            label: '{{ t("integer") }}',
-            value: 'integer',
-          },
-          {
-            label: '{{ t("idcard") }}',
-            value: 'idcard',
-          },
-          {
-            label: '{{ t("qq") }}',
-            value: 'qq',
-          },
-          {
-            label: '{{ t("phone") }}',
-            value: 'phone',
-          },
-          {
-            label: '{{ t("money") }}',
-            value: 'money',
-          },
-          {
-            label: '{{ t("zh") }}',
-            value: 'zh',
-          },
-          {
-            label: '{{ t("date") }}',
-            value: 'date',
-          },
-          {
-            label: '{{ t("zip") }}',
-            value: 'zip',
-          },
-        ],
-      },
-      pattern: {
-        type: 'string',
-        title: '{{ t("Regular expression") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        'x-component-props': {
-          prefix: '/',
-          suffix: '/',
-        },
-      },
-    };
-  }
 }

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

@@ -8,8 +8,7 @@
  */
 
 import { registerValidateFormats } from '@formily/core';
-import { i18n } from '../../i18n';
-import { defaultProps, operators, unique, autoIncrement, primaryKey } from './properties';
+import { defaultProps, unique, autoIncrement, primaryKey } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
 registerValidateFormats({
@@ -61,75 +60,7 @@ export class IntegerFieldInterface extends CollectionFieldInterface {
     autoIncrement,
   };
   filterable = {
-    operators: operators.number,
+    operators: 'number',
   };
   titleUsable = true;
-  validateSchema = (fieldSchema) => {
-    return {
-      maximum: {
-        type: 'number',
-        title: '{{ t("Maximum") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-component-props': {
-          precision: 0,
-        },
-        'x-reactions': `{{(field) => {
-          const targetValue = field.query('.minimum').value();
-          field.selfErrors =
-            !!targetValue && !!field.value && targetValue > field.value ? '${i18n.t(
-              'Maximum must greater than minimum',
-            )}' : ''
-        }}}`,
-      },
-      minimum: {
-        type: 'number',
-        title: '{{ t("Minimum") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-component-props': {
-          precision: 0,
-        },
-        'x-reactions': {
-          dependencies: ['.maximum'],
-          fulfill: {
-            state: {
-              selfErrors: `{{!!$deps[0] && !!$self.value && $deps[0] < $self.value ? '${i18n.t(
-                'Minimum must less than maximum',
-              )}' : ''}}`,
-            },
-          },
-        },
-      },
-      format: {
-        type: 'string',
-        title: '{{ t("Format") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Select',
-        'x-component-props': {
-          allowClear: true,
-        },
-        enum: [
-          {
-            label: '{{ t("Odd") }}',
-            value: 'odd',
-          },
-          {
-            label: '{{ t("Even") }}',
-            value: 'even',
-          },
-        ],
-      },
-      pattern: {
-        type: 'string',
-        title: '{{ t("Regular expression") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        'x-component-props': {
-          prefix: '/',
-          suffix: '/',
-        },
-      },
-    };
-  };
 }

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

@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { FormItem, FormLayout } from '@formily/antd-v5';
 import { registerValidateRules } from '@formily/core';
-import React from 'react';
 import { defaultProps } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
@@ -55,19 +53,27 @@ export class JsonFieldInterface extends CollectionFieldInterface {
   properties = {
     ...defaultProps,
     jsonb: {
-      type: 'boolean',
       title: 'JSONB',
-      // 不直接用 `FormItem` 的原因是为了想要设置 `FormLayout` 的 `layout` 属性为 `horizontal` （默认就是 horizontal）
-      'x-decorator': ({ children }) => (
-        <FormLayout>
-          <FormItem>{children}</FormItem>
-        </FormLayout>
-      ),
       'x-component': 'Checkbox',
-      'x-hidden': `{{ !isDialect('postgres') }}`,
-      'x-disabled': `{{ disabledJSONB }}`,
     },
   };
+  configure = {
+    items: [
+      {
+        name: 'jsonb',
+        title: 'JSONB',
+        component: 'Checkbox',
+        schema: {
+          'x-content': ' ',
+        },
+        hidden: ({ context }) => {
+          const isDialect = context.isDialect;
+          return typeof isDialect === 'function' ? !isDialect('postgres') : true;
+        },
+        disabled: ({ context }) => !!context.disabledJSONB,
+      },
+    ],
+  };
   // filterable = {
   //   operators: operators.string,
   // };

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

@@ -7,10 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { getUniqueKeyFromCollection } from './utils';
 import { defaultProps, relationshipType, reverseFieldProperties } from './properties';
 
 export class M2MFieldInterface extends CollectionFieldInterface {
@@ -56,24 +54,6 @@ export class M2MFieldInterface extends CollectionFieldInterface {
   };
   availableTypes = ['belongsToMany'];
   validationType = 'object';
-  schemaInitialize(schema: ISchema, { field, readPretty, block, targetCollection }) {
-    // schema['type'] = 'array';
-    schema['x-component-props'] = schema['x-component-props'] || {};
-    schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
-      value: getUniqueKeyFromCollection(targetCollection),
-    };
-    schema['x-component-props'].fieldNames.label =
-      schema['x-component-props'].fieldNames?.label ||
-      targetCollection?.titleField ||
-      getUniqueKeyFromCollection(targetCollection);
-
-    if (['Table', 'Kanban'].includes(block)) {
-      schema['x-component-props'] = schema['x-component-props'] || {};
-      schema['x-component-props']['ellipsis'] = true;
-      // 预览文件时需要的参数
-      schema['x-component-props']['size'] = 'small';
-    }
-  }
   initialize(values: any) {
     if (values.type === 'belongsToMany') {
       if (!values.through) {
@@ -142,7 +122,6 @@ export class M2MFieldInterface extends CollectionFieldInterface {
                   type: 'string',
                   title: '{{t("Target collection")}}',
                   required: true,
-                  'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
                   'x-decorator': 'FormItem',
                   'x-component': 'Select',
                   'x-disabled': '{{ !createOnly }}',

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

@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { getUniqueKeyFromCollection } from './utils';
 import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
 
 export class M2OFieldInterface extends CollectionFieldInterface {
@@ -55,25 +53,6 @@ export class M2OFieldInterface extends CollectionFieldInterface {
     },
   };
   availableTypes = ['belongsTo'];
-  schemaInitialize(schema: ISchema, { field, block, readPretty, targetCollection }) {
-    // schema['type'] = 'object';
-    schema['x-component-props'] = schema['x-component-props'] || {};
-    schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
-      value: getUniqueKeyFromCollection(targetCollection),
-    };
-    schema['x-component-props'].fieldNames.label =
-      schema['x-component-props'].fieldNames?.label ||
-      targetCollection?.titleField ||
-      getUniqueKeyFromCollection(targetCollection);
-
-    if (['Table', 'Kanban'].includes(block)) {
-      schema['x-component-props'] = schema['x-component-props'] || {};
-      schema['x-component-props']['ellipsis'] = true;
-      // 预览文件时需要的参数
-      schema['x-component-props']['size'] = 'small';
-    }
-  }
-
   properties = {
     'uiSchema.title': {
       type: 'string',
@@ -122,7 +101,6 @@ export class M2OFieldInterface extends CollectionFieldInterface {
                   type: 'string',
                   title: '{{t("Target collection")}}',
                   required: true,
-                  'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
                   'x-decorator': 'FormItem',
                   'x-component': 'Select',
                   'x-disabled': '{{ !createOnly }}',

package/src/collection-manager/interfaces/markdown.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 MarkdownFieldInterface extends CollectionFieldInterface {
@@ -31,54 +29,7 @@ export class MarkdownFieldInterface 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/multipleSelect.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 MultipleSelectFieldInterface extends CollectionFieldInterface {
@@ -36,17 +35,6 @@ export class MultipleSelectFieldInterface extends CollectionFieldInterface {
     'uiSchema.enum': dataSource,
   };
   filterable = {
-    operators: operators.array,
+    operators: 'array',
   };
-  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/nanoid.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 NanoidFieldInterface extends CollectionFieldInterface {
   name = 'nanoid';
   type = 'object';
@@ -76,7 +76,7 @@ export class NanoidFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.string,
+    operators: 'string',
   };
   titleUsable = true;
 }

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

@@ -8,8 +8,7 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { i18n } from '../../i18n';
-import { defaultProps, operators, unique } from './properties';
+import { defaultProps, unique } from './properties';
 
 export class NumberFieldInterface extends CollectionFieldInterface {
   name = 'number';
@@ -74,14 +73,6 @@ export class NumberFieldInterface extends CollectionFieldInterface {
       'x-decorator': 'FormItem',
       'x-disabled': '{{ !createOnly }}',
       default: 10,
-      'x-reactions': {
-        dependencies: ['type'],
-        fulfill: {
-          state: {
-            visible: '{{$deps[0] === "decimal"}}',
-          },
-        },
-      },
     },
     scale: {
       type: 'string',
@@ -90,84 +81,10 @@ export class NumberFieldInterface extends CollectionFieldInterface {
       'x-decorator': 'FormItem',
       'x-disabled': '{{ !createOnly }}',
       default: 2,
-      'x-reactions': {
-        dependencies: ['type'],
-        fulfill: {
-          state: {
-            visible: '{{$deps[0] === "decimal"}}',
-          },
-        },
-      },
     },
   };
   filterable = {
-    operators: operators.number,
+    operators: 'number',
   };
   titleUsable = true;
-  validateSchema(fieldSchema) {
-    return {
-      maximum: {
-        type: 'number',
-        title: '{{ t("Maximum") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-reactions': `{{(field) => {
-          const targetValue = field.query('.minimum').value();
-          field.selfErrors =
-            !!targetValue && !!field.value && targetValue > field.value ? '${i18n.t(
-              'Maximum must greater than minimum',
-            )}' : ''
-        }}}`,
-      },
-      minimum: {
-        type: 'number',
-        title: '{{ t("Minimum") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-reactions': {
-          dependencies: ['.maximum'],
-          fulfill: {
-            state: {
-              selfErrors: `{{!!$deps[0] && !!$self.value && $deps[0] < $self.value ? '${i18n.t(
-                'Minimum must less than maximum',
-              )}' : ''}}`,
-            },
-          },
-        },
-      },
-      format: {
-        type: 'string',
-        title: '{{ t("Format") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Select',
-        'x-component-props': {
-          allowClear: true,
-        },
-        enum: [
-          {
-            label: '{{ t("Integer") }}',
-            value: 'integer',
-          },
-          {
-            label: '{{ t("Odd") }}',
-            value: 'odd',
-          },
-          {
-            label: '{{ t("Even") }}',
-            value: 'even',
-          },
-        ],
-      },
-      pattern: {
-        type: 'string',
-        title: '{{ t("Regular expression") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        'x-component-props': {
-          prefix: '/',
-          suffix: '/',
-        },
-      },
-    };
-  }
 }