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

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

@@ -7,10 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
-import { getUniqueKeyFromCollection } from './utils';
 export class O2MFieldInterface extends CollectionFieldInterface {
   name = 'o2m';
   type = 'object';
@@ -54,23 +52,6 @@ export class O2MFieldInterface extends CollectionFieldInterface {
     },
   };
   availableTypes = ['hasMany'];
-  schemaInitialize(schema: ISchema, { field, block, readPretty, 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';
-    }
-  }
   properties = {
     'uiSchema.title': {
       type: 'string',
@@ -118,7 +99,6 @@ export class O2MFieldInterface extends CollectionFieldInterface {
                   type: 'string',
                   title: '{{t("Target collection")}}',
                   required: true,
-                  'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
                   'x-decorator': 'FormItem',
                   'x-component': 'Select',
                   'x-disabled': '{{ !createOnly }}',
@@ -139,10 +119,9 @@ export class O2MFieldInterface extends CollectionFieldInterface {
                   type: 'string',
                   title: '{{t("Source key")}}',
                   description: "{{t('Field values must be unique.')}}",
-                  default: 'id',
-                  enum: [{ label: 'ID', value: 'id' }],
                   'x-decorator': 'FormItem',
                   'x-component': 'SourceKey',
+                  'x-disabled': '{{ !createOnly }}',
                 },
               },
             },

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

@@ -0,0 +1,145 @@
+/**
+ * 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 { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
+import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
+
+export class OBOFieldInterface extends CollectionFieldInterface {
+  name = 'obo';
+  type = 'object';
+  group = 'relation';
+  order = 3.1;
+  title = '{{t("One to one (belongs to)")}}';
+  description = '{{t("One to one description")}}';
+  isAssociation = true;
+  validationType = 'object';
+  default = {
+    type: 'belongsTo',
+    uiSchema: {
+      'x-component': 'AssociationField',
+      'x-component-props': {
+        multiple: false,
+      },
+    },
+    reverseField: {
+      interface: 'oho',
+      type: 'hasOne',
+      uiSchema: {
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: false,
+        },
+      },
+    },
+  };
+  availableTypes = ['belongsTo'];
+  properties = {
+    'uiSchema.title': {
+      type: 'string',
+      title: '{{t("Field display name")}}',
+      required: true,
+      'x-decorator': 'FormItem',
+      'x-component': 'Input',
+    },
+    name: {
+      type: 'string',
+      title: '{{t("Field name")}}',
+      required: true,
+      'x-disabled': '{{ !createOnly }}',
+      'x-decorator': 'FormItem',
+      'x-component': 'Input',
+      description:
+        "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
+    },
+    type: relationshipType,
+    grid: {
+      type: 'void',
+      'x-component': 'Grid',
+      properties: {
+        row1: {
+          type: 'void',
+          'x-component': 'Grid.Row',
+          properties: {
+            col11: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                source: {
+                  type: 'void',
+                  title: '{{t("Source collection")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'SourceCollection',
+                  'x-disabled': true,
+                },
+              },
+            },
+            col12: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                target: {
+                  type: 'string',
+                  title: '{{t("Target collection")}}',
+                  required: true,
+                  'x-decorator': 'FormItem',
+                  'x-component': 'Select',
+                  'x-disabled': '{{ !createOnly }}',
+                },
+              },
+            },
+          },
+        },
+        row2: {
+          type: 'void',
+          'x-component': 'Grid.Row',
+          properties: {
+            col21: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                foreignKey: {
+                  type: 'string',
+                  title: '{{t("Foreign key")}}',
+                  required: true,
+                  default: '{{ useNewId("f_") }}',
+                  description:
+                    "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
+                  'x-decorator': 'FormItem',
+                  'x-component': 'ForeignKey',
+                  'x-validator': 'uid',
+                  'x-disabled': '{{ !createOnly }}',
+                },
+              },
+            },
+            col22: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                targetKey: {
+                  type: 'string',
+                  title: '{{t("Target key")}}',
+                  description: "{{t('Field values must be unique.')}}",
+                  'x-decorator': 'FormItem',
+                  'x-component': 'TargetKey',
+                  'x-disabled': '{{ !createOnly }}',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    ...constraintsProps,
+    ...reverseFieldProperties,
+  };
+  filterable = {
+    nested: true,
+    children: [],
+  };
+}

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

@@ -0,0 +1,145 @@
+/**
+ * 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 { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
+import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
+
+export class OHOFieldInterface extends CollectionFieldInterface {
+  name = 'oho';
+  type = 'object';
+  group = 'relation';
+  order = 3;
+  title = '{{t("One to one (has one)")}}';
+  description = '{{t("One to one description")}}';
+  isAssociation = true;
+  validationType = 'object';
+  default = {
+    type: 'hasOne',
+    uiSchema: {
+      'x-component': 'AssociationField',
+      'x-component-props': {
+        multiple: false,
+      },
+    },
+    reverseField: {
+      interface: 'obo',
+      type: 'belongsTo',
+      uiSchema: {
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: false,
+        },
+      },
+    },
+  };
+  availableTypes = ['hasOne'];
+  properties = {
+    'uiSchema.title': {
+      type: 'string',
+      title: '{{t("Field display name")}}',
+      required: true,
+      'x-decorator': 'FormItem',
+      'x-component': 'Input',
+    },
+    name: {
+      type: 'string',
+      title: '{{t("Field name")}}',
+      required: true,
+      'x-disabled': '{{ !createOnly }}',
+      'x-decorator': 'FormItem',
+      'x-component': 'Input',
+      description:
+        "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
+    },
+    type: relationshipType,
+    grid: {
+      type: 'void',
+      'x-component': 'Grid',
+      properties: {
+        row1: {
+          type: 'void',
+          'x-component': 'Grid.Row',
+          properties: {
+            col11: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                source: {
+                  type: 'void',
+                  title: '{{t("Source collection")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'SourceCollection',
+                  'x-disabled': true,
+                },
+              },
+            },
+            col12: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                target: {
+                  type: 'string',
+                  title: '{{t("Target collection")}}',
+                  required: true,
+                  'x-decorator': 'FormItem',
+                  'x-component': 'Select',
+                  'x-disabled': '{{ !createOnly }}',
+                },
+              },
+            },
+          },
+        },
+        row2: {
+          type: 'void',
+          'x-component': 'Grid.Row',
+          properties: {
+            col21: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                sourceKey: {
+                  type: 'string',
+                  title: '{{t("Source key")}}',
+                  description: "{{t('Field values must be unique.')}}",
+                  'x-decorator': 'FormItem',
+                  'x-component': 'SourceKey',
+                  'x-disabled': '{{ !createOnly }}',
+                },
+              },
+            },
+            col22: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                foreignKey: {
+                  type: 'string',
+                  title: '{{t("Foreign key")}}',
+                  required: true,
+                  default: '{{ useNewId("f_") }}',
+                  description:
+                    "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}",
+                  'x-decorator': 'FormItem',
+                  'x-component': 'ForeignKey',
+                  'x-validator': 'uid',
+                  'x-disabled': '{{ !createOnly }}',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    ...constraintsProps,
+    ...reverseFieldProperties,
+  };
+  filterable = {
+    nested: true,
+    children: [],
+  };
+}

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

@@ -8,8 +8,7 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { i18n } from '../../i18n';
-import { defaultProps, unique, operators } from './properties';
+import { defaultProps, unique } from './properties';
 
 export class PasswordFieldInterface extends CollectionFieldInterface {
   name = 'password';
@@ -33,48 +32,7 @@ export class PasswordFieldInterface extends CollectionFieldInterface {
     ...defaultProps,
     unique,
   };
-  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/percent.ts

@@ -8,9 +8,8 @@
  */
 
 import { registerValidateRules } from '@formily/core';
-import { ISchema } from '@formily/react';
 import { i18n } from '../../i18n';
-import { defaultProps, operators, unique } from './properties';
+import { defaultProps, unique } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
 registerValidateRules({
@@ -77,13 +76,6 @@ export class PercentFieldInterface extends CollectionFieldInterface {
       },
     },
   };
-  schemaInitialize(schema: ISchema, { field, block, readPretty, action }) {
-    const props = (schema['x-component-props'] = schema['x-component-props'] || {});
-    schema['x-component-props'].style = {
-      ...(props.style || {}),
-      width: '100%',
-    };
-  }
   availableTypes = ['float', 'double', 'decimal'];
   hasDefaultValue = true;
   validationType = 'number';
@@ -108,71 +100,7 @@ export class PercentFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.number,
+    operators: 'number',
   };
   titleUsable = true;
-  validateSchema = (fieldSchema) => {
-    return {
-      maxValue: {
-        type: 'number',
-        title: '{{ t("Maximum") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Percent',
-        'x-component-props': {
-          addonAfter: '%',
-        },
-        'x-reactions': `{{(field) => {
-          const targetValue = field.query('.minimum').value();
-          field.selfErrors =
-            !!targetValue && !!field.value && targetValue > field.value ? '${i18n.t(
-              'Maximum must greater than minimum',
-            )}' : ''
-        }}}`,
-      },
-      minValue: {
-        type: 'number',
-        title: '{{ t("Minimum") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Percent',
-        'x-component-props': {
-          addonAfter: '%',
-        },
-        'x-reactions': {
-          dependencies: ['.maximum'],
-          fulfill: {
-            state: {
-              selfErrors: `{{!!$deps[0] && !!$self.value && $deps[0] < $self.value ? '${i18n.t(
-                'Minimum must less than maximum',
-              )}' : ''}}`,
-            },
-          },
-        },
-      },
-      percentFormat: {
-        type: 'string',
-        title: '{{ t("Format") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Select',
-        'x-component-props': {
-          allowClear: true,
-        },
-        enum: [
-          {
-            label: '{{ t("Integer") }}',
-            value: 'Integer',
-          },
-        ],
-      },
-      pattern: {
-        type: 'string',
-        title: '{{ t("Regular expression") }}',
-        'x-decorator': 'FormItem',
-        'x-component': 'Input',
-        'x-component-props': {
-          prefix: '/',
-          suffix: '/',
-        },
-      },
-    };
-  };
 }

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

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { defaultProps, operators, unique } from './properties';
+import { defaultProps, unique } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
 export class PhoneFieldInterface extends CollectionFieldInterface {
@@ -37,7 +37,7 @@ export class PhoneFieldInterface extends CollectionFieldInterface {
     unique,
   };
   filterable = {
-    operators: operators.string,
+    operators: 'string',
   };
   titleUsable = true;
 }