@nocobase/client 0.7.0-alpha.82 → 0.7.1-alpha.4

package/lib/collection-manager/interfaces/o2o.d.ts

@@ -0,0 +1,4 @@
+import { IField } from './types';
+export declare const o2o: IField;
+export declare const oho: IField;
+export declare const obo: IField;

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

@@ -0,0 +1,530 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.oho = exports.obo = exports.o2o = void 0;
+
+var _lodash = require("lodash");
+
+var _properties = require("./properties");
+
+var o2o = {
+  name: 'o2o',
+  type: 'object',
+  group: 'relation',
+  order: 3,
+  title: '{{t("One to one")}}',
+  description: '{{t("One to one description")}}',
+  isAssociation: true,
+  default: {
+    type: 'hasOne',
+    // name,
+    uiSchema: {
+      // title,
+      'x-component': 'RecordPicker',
+      'x-component-props': {
+        // mode: 'tags',
+        multiple: false,
+        fieldNames: {
+          label: 'id',
+          value: 'id'
+        }
+      }
+    },
+    reverseField: {
+      interface: 'obo',
+      type: 'belongsTo',
+      // title: '{{t("One to one (belongs to)")}}',
+      // name,
+      uiSchema: {
+        // title,
+        'x-component': 'RecordPicker',
+        'x-component-props': {
+          // mode: 'tags',
+          multiple: false,
+          fieldNames: {
+            label: 'id',
+            value: 'id'
+          }
+        }
+      }
+    }
+  },
+  schemaInitialize: function schemaInitialize(schema, _ref) {
+    var readPretty = _ref.readPretty,
+        block = _ref.block;
+
+    if (readPretty) {
+      schema['properties'] = {
+        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
+      };
+    } else {
+      schema['properties'] = {
+        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
+      };
+    }
+
+    if (['Table', 'Kanban'].includes(block)) {
+      schema['x-component-props'] = schema['x-component-props'] || {};
+      schema['x-component-props']['ellipsis'] = true;
+    }
+  },
+  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: _properties.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-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
+                  '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: 'void',
+                  title: '{{t("Source key")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'SourceKey'
+                }
+              }
+            },
+            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': 'Input',
+                  'x-disabled': '{{ !createOnly }}'
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  filterable: {
+    nested: true,
+    children: [// {
+      //   name: 'id',
+      //   title: '{{t("Exists")}}',
+      //   operators: [
+      //     { label: '{{t("exists")}}', value: '$exists', noValue: true },
+      //     { label: '{{t("not exists")}}', value: '$notExists', noValue: true },
+      //   ],
+      //   schema: {
+      //     title: '{{t("Exists")}}',
+      //     type: 'string',
+      //     'x-component': 'Input',
+      //   },
+      // },
+    ]
+  }
+};
+exports.o2o = o2o;
+var oho = {
+  name: 'oho',
+  type: 'object',
+  group: 'relation',
+  order: 3,
+  title: '{{t("One to one (has one)")}}',
+  description: '{{t("One to one description")}}',
+  isAssociation: true,
+  default: {
+    type: 'hasOne',
+    // name,
+    uiSchema: {
+      // title,
+      'x-component': 'RecordPicker',
+      'x-component-props': {
+        // mode: 'tags',
+        multiple: false,
+        fieldNames: {
+          label: 'id',
+          value: 'id'
+        }
+      }
+    },
+    reverseField: {
+      interface: 'obo',
+      type: 'belongsTo',
+      // title: '{{t("One to one (belongs to)")}}',
+      // name,
+      uiSchema: {
+        // title,
+        'x-component': 'RecordPicker',
+        'x-component-props': {
+          // mode: 'tags',
+          multiple: false,
+          fieldNames: {
+            label: 'id',
+            value: 'id'
+          }
+        }
+      }
+    }
+  },
+  schemaInitialize: function schemaInitialize(schema, _ref2) {
+    var readPretty = _ref2.readPretty,
+        block = _ref2.block;
+
+    if (readPretty) {
+      schema['properties'] = {
+        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
+      };
+    } else {
+      schema['properties'] = {
+        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
+      };
+    }
+
+    if (['Table', 'Kanban'].includes(block)) {
+      schema['x-component-props'] = schema['x-component-props'] || {};
+      schema['x-component-props']['ellipsis'] = true;
+    }
+  },
+  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: _properties.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-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
+                  '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: 'void',
+                  title: '{{t("Source key")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'SourceKey'
+                }
+              }
+            },
+            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': 'Input',
+                  'x-disabled': '{{ !createOnly }}'
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  filterable: {
+    nested: true,
+    children: [// {
+      //   name: 'id',
+      //   title: '{{t("Exists")}}',
+      //   operators: [
+      //     { label: '{{t("exists")}}', value: '$exists', noValue: true },
+      //     { label: '{{t("not exists")}}', value: '$notExists', noValue: true },
+      //   ],
+      //   schema: {
+      //     title: '{{t("Exists")}}',
+      //     type: 'string',
+      //     'x-component': 'Input',
+      //   },
+      // },
+    ]
+  }
+};
+exports.oho = oho;
+var obo = {
+  name: 'obo',
+  type: 'object',
+  group: 'relation',
+  order: 3,
+  title: '{{t("One to one (belongs to)")}}',
+  description: '{{t("One to one description")}}',
+  isAssociation: true,
+  default: {
+    type: 'belongsTo',
+    // name,
+    uiSchema: {
+      // title,
+      'x-component': 'RecordPicker',
+      'x-component-props': {
+        // mode: 'tags',
+        multiple: false,
+        fieldNames: {
+          label: 'id',
+          value: 'id'
+        }
+      }
+    },
+    reverseField: {
+      interface: 'oho',
+      type: 'hasOne',
+      // name,
+      uiSchema: {
+        // title,
+        'x-component': 'RecordPicker',
+        'x-component-props': {
+          // mode: 'tags',
+          multiple: true,
+          fieldNames: {
+            label: 'id',
+            value: 'id'
+          }
+        }
+      }
+    }
+  },
+  schemaInitialize: function schemaInitialize(schema, _ref3) {
+    var readPretty = _ref3.readPretty,
+        block = _ref3.block;
+
+    if (readPretty) {
+      schema['properties'] = {
+        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
+      };
+    } else {
+      schema['properties'] = {
+        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
+      };
+    }
+
+    if (['Table', 'Kanban'].includes(block)) {
+      schema['x-component-props'] = schema['x-component-props'] || {};
+      schema['x-component-props']['ellipsis'] = true;
+    }
+  },
+  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: _properties.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-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
+                  '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': 'Input',
+                  'x-disabled': '{{ !createOnly }}'
+                }
+              }
+            },
+            col22: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                targetKey: {
+                  type: 'void',
+                  title: '{{t("Target key")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'TargetKey',
+                  'x-disabled': '{{ !createOnly }}'
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  filterable: {
+    nested: true,
+    children: [// {
+      //   name: 'id',
+      //   title: '{{t("Exists")}}',
+      //   operators: [
+      //     { label: '{{t("exists")}}', value: '$exists', noValue: true },
+      //     { label: '{{t("not exists")}}', value: '$notExists', noValue: true },
+      //   ],
+      //   schema: {
+      //     title: '{{t("Exists")}}',
+      //     type: 'string',
+      //     'x-component': 'Input',
+      //   },
+      // },
+    ]
+  }
+};
+exports.obo = obo;

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

@@ -26,7 +26,7 @@ var percent = {
     uiSchema: {
       type: 'string',
       // title,
-      'x-component': 'InputNumber',
+      'x-component': 'Percent',
       'x-component-props': {
         stringMode: true,
         step: '0',
@@ -43,22 +43,22 @@ var percent = {
       default: '0',
       enum: [{
         value: '0',
-        label: '1'
+        label: '1%'
       }, {
         value: '0.1',
-        label: '1.0'
+        label: '1.0%'
       }, {
         value: '0.01',
-        label: '1.00'
+        label: '1.00%'
       }, {
         value: '0.001',
-        label: '1.000'
+        label: '1.000%'
       }, {
         value: '0.0001',
-        label: '1.0000'
+        label: '1.0000%'
       }, {
         value: '0.00001',
-        label: '1.00000'
+        label: '1.00000%'
       }]
     }
   }),

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

@@ -27,7 +27,10 @@ var phone = {
       type: 'string',
       // title,
       'x-component': 'Input',
-      'x-validator': 'phone'
+      'x-component-props': {
+        type: 'tel'
+      } // 'x-validator': 'phone',
+
     }
   },
   properties: _objectSpread({}, _properties.defaultProps),

package/lib/collection-manager/interfaces/properties/index.d.ts

@@ -1,6 +1,7 @@
 import { ISchema } from '@formily/react';
 export * as operators from './operators';
 export declare const type: ISchema;
+export declare const relationshipType: ISchema;
 export declare const dateTimeProps: {
     [key: string]: ISchema;
 };

package/lib/collection-manager/interfaces/properties/index.js

@@ -5,7 +5,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.type = exports.recordPickerViewer = exports.recordPickerSelector = exports.operators = exports.defaultProps = exports.dateTimeProps = exports.dataSource = void 0;
+exports.type = exports.relationshipType = exports.recordPickerViewer = exports.recordPickerSelector = exports.operators = exports.defaultProps = exports.dateTimeProps = exports.dataSource = void 0;
+
+var _shared = require("@formily/shared");
 
 var _operators = _interopRequireWildcard(require("./operators"));
 
@@ -73,6 +75,28 @@ var type = {
   }]
 };
 exports.type = type;
+var relationshipType = {
+  type: 'string',
+  title: '{{t("Relationship type")}}',
+  required: true,
+  'x-disabled': true,
+  'x-decorator': 'FormItem',
+  'x-component': 'Select',
+  enum: [{
+    label: "{{t('HasOne')}}",
+    value: 'hasOne'
+  }, {
+    label: "{{t('HasMany')}}",
+    value: 'hasMany'
+  }, {
+    label: "{{t('BelongsTo')}}",
+    value: 'belongsTo'
+  }, {
+    label: "{{t('BelongsToMany')}}",
+    value: 'belongsToMany'
+  }]
+};
+exports.relationshipType = relationshipType;
 var dateTimeProps = {
   'uiSchema.x-component-props.dateFormat': {
     type: 'string',
@@ -149,12 +173,18 @@ var dataSource = {
         'x-component-props': {
           title: '{{t("Option value")}}'
         },
-        'x-hidden': true,
+        // 'x-hidden': true,
         properties: {
           value: {
             type: 'string',
+            required: true,
             'x-decorator': 'FormItem',
-            'x-component': 'Input'
+            'x-component': 'Input',
+            'x-reactions': function xReactions(field) {
+              if (!field.initialValue) {
+                field.initialValue = (0, _shared.uid)();
+              }
+            }
           }
         }
       },
@@ -167,6 +197,7 @@ var dataSource = {
         properties: {
           label: {
             type: 'string',
+            required: true,
             'x-decorator': 'FormItem',
             'x-component': 'Input'
           }

package/lib/i18n/i18n.js

@@ -11,7 +11,7 @@ var _moment = _interopRequireDefault(require("moment"));
 
 var _reactI18next = require("react-i18next");
 
-var _locale = require("../locale");
+var _locale = _interopRequireDefault(require("../locale"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -20,6 +20,10 @@ var log = require('debug')('i18next');
 var i18n = _i18next.default.createInstance();
 
 exports.i18n = i18n;
+var resources = {};
+Object.keys(_locale.default).forEach(function (lang) {
+  resources[lang] = _locale.default[lang].resources;
+});
 i18n.use(_reactI18next.initReactI18next).init({
   lng: localStorage.getItem('NOCOBASE_LOCALE') || 'en-US',
   // debug: true,
@@ -29,15 +33,11 @@ i18n.use(_reactI18next.initReactI18next).init({
   //   return key;
   // },
   // ns: ['client'],
-  resources: _locale.resources
+  resources: resources
 });
-var momentLngs = {
-  'en-US': 'en',
-  'zh-CN': 'zh-cn'
-};
 
 function setMomentLng(language) {
-  var lng = momentLngs[language || 'en-US'] || 'en';
+  var lng = _locale.default[language || 'en-US'].moment || 'en';
   log(lng);
 
   _moment.default.locale(lng);