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

package/es/collection-manager/hooks/useCollectionManager.js

@@ -1,3 +1,7 @@
+function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -20,6 +24,31 @@ export var useCollectionManager = function useCollectionManager() {
       interfaces = _useContext.interfaces,
       collections = _useContext.collections;
 
+  var getCollectionField = function getCollectionField(name) {
+    var _collection$fields;
+
+    var _name$split = name.split('.'),
+        _name$split2 = _slicedToArray(_name$split, 2),
+        collectionName = _name$split2[0],
+        fieldName = _name$split2[1];
+
+    if (!fieldName) {
+      return;
+    }
+
+    var collection = collections === null || collections === void 0 ? void 0 : collections.find(function (collection) {
+      return collection.name === collectionName;
+    });
+
+    if (!collection) {
+      return;
+    }
+
+    return collection === null || collection === void 0 ? void 0 : (_collection$fields = collection.fields) === null || _collection$fields === void 0 ? void 0 : _collection$fields.find(function (field) {
+      return field.name === fieldName;
+    });
+  };
+
   return {
     service: service,
     interfaces: interfaces,
@@ -47,29 +76,23 @@ export var useCollectionManager = function useCollectionManager() {
       });
       return (collection === null || collection === void 0 ? void 0 : collection.fields) || [];
     },
-    getCollectionField: function getCollectionField(name) {
-      var _collection$fields;
-
-      var _name$split = name.split('.'),
-          _name$split2 = _slicedToArray(_name$split, 2),
-          collectionName = _name$split2[0],
-          fieldName = _name$split2[1];
+    getCollectionField: getCollectionField,
+    getCollectionJoinField: function getCollectionJoinField(name) {
+      var _name$split3 = name.split('.'),
+          _name$split4 = _toArray(_name$split3),
+          collectionName = _name$split4[0],
+          fieldNames = _name$split4.slice(1);
 
-      if (!fieldName) {
+      if (!(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.length)) {
         return;
       }
 
-      var collection = collections === null || collections === void 0 ? void 0 : collections.find(function (collection) {
-        return collection.name === collectionName;
-      });
-
-      if (!collection) {
-        return;
-      }
-
-      return collection === null || collection === void 0 ? void 0 : (_collection$fields = collection.fields) === null || _collection$fields === void 0 ? void 0 : _collection$fields.find(function (field) {
-        return field.name === fieldName;
-      });
+      var cName = collectionName;
+      return fieldNames.reduce(function (result, curFieldName) {
+        var collectionField = getCollectionField("".concat(cName, ".").concat(curFieldName));
+        cName = collectionField.target;
+        return collectionField;
+      }, null);
     },
     getInterface: function getInterface(name) {
       return interfaces[name] ? clone(interfaces[name]) : null;

package/es/collection-manager/index.d.ts

@@ -1,3 +1,4 @@
+export { useCollectionFilterOptions, useSortFields } from './action-hooks';
 export * from './CollectionField';
 export * from './CollectionFieldProvider';
 export * from './CollectionManagerProvider';

package/es/collection-manager/index.js

@@ -1,3 +1,4 @@
+export { useCollectionFilterOptions, useSortFields } from './action-hooks';
 export * from './CollectionField';
 export * from './CollectionFieldProvider';
 export * from './CollectionManagerProvider';

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

@@ -28,7 +28,7 @@ export var attachment = {
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;
 
-    if (['Table', 'KanbanV2'].includes(block)) {
+    if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['size'] = 'small';
     }

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

@@ -95,10 +95,10 @@ export var chinaRegion = {
   filterable: {
     children: [{
       name: 'name',
-      title: '{{t("Filename")}}',
+      title: '{{t("Province/city/area name")}}',
       operators: operators.string,
       schema: {
-        title: '{{t("Filename")}}',
+        title: '{{t("Province/city/area name")}}',
         type: 'string',
         'x-component': 'Input'
       }

package/es/collection-manager/interfaces/components/index.d.ts

@@ -0,0 +1,6 @@
+export declare const TargetKey: () => JSX.Element;
+export declare const ThroughCollection: () => JSX.Element;
+export declare const SourceKey: () => JSX.Element;
+export declare const ForeignKey: () => JSX.Element;
+export declare const ForeignKey1: () => JSX.Element;
+export declare const ForeignKey2: () => JSX.Element;

package/es/collection-manager/interfaces/components/index.js

@@ -0,0 +1,30 @@
+import { Switch } from 'antd';
+import React from 'react';
+export var TargetKey = function TargetKey() {
+  return /*#__PURE__*/React.createElement("div", null, "Target key");
+};
+export var ThroughCollection = function ThroughCollection() {
+  return /*#__PURE__*/React.createElement("div", null, "Through collection ", /*#__PURE__*/React.createElement(Switch, {
+    size: 'small',
+    defaultChecked: true,
+    checkedChildren: "Auto fill",
+    unCheckedChildren: "Customize"
+  }));
+};
+export var SourceKey = function SourceKey() {
+  return /*#__PURE__*/React.createElement("div", null, "Source key");
+};
+export var ForeignKey = function ForeignKey() {
+  return /*#__PURE__*/React.createElement("div", null, "Foreign key ", /*#__PURE__*/React.createElement(Switch, {
+    size: 'small',
+    defaultChecked: true,
+    checkedChildren: "Auto fill",
+    unCheckedChildren: "Customize"
+  }));
+};
+export var ForeignKey1 = function ForeignKey1() {
+  return /*#__PURE__*/React.createElement("div", null, "Foreign key 1 ", /*#__PURE__*/React.createElement("a", null, "\u65B0\u5EFA"));
+};
+export var ForeignKey2 = function ForeignKey2() {
+  return /*#__PURE__*/React.createElement("div", null, "Foreign key 2 ", /*#__PURE__*/React.createElement("a", null, "\u65B0\u5EFA"));
+};

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

@@ -24,7 +24,16 @@ export var datetime = {
       }
     }
   },
-  properties: _objectSpread(_objectSpread({}, defaultProps), dateTimeProps),
+  properties: _objectSpread(_objectSpread(_objectSpread({}, defaultProps), dateTimeProps), {}, {
+    'uiSchema.x-component-props.gmt': {
+      type: 'boolean',
+      title: '{{t("GMT")}}',
+      'x-component': 'Checkbox',
+      'x-content': '{{t("Use the same time zone (GMT) for all users")}}',
+      'x-decorator': 'FormItem',
+      default: false
+    }
+  }),
   filterable: {
     operators: operators.datetime
   }

package/es/collection-manager/interfaces/formula.d.ts

@@ -0,0 +1,2 @@
+import { IField } from './types';
+export declare const formula: IField;

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

@@ -0,0 +1,74 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { defaultProps, operators } from './properties';
+export var formula = {
+  name: 'formula',
+  type: 'object',
+  group: 'advanced',
+  order: 1,
+  title: '{{t("Formula")}}',
+  description: '{{t("Formula description")}}',
+  sortable: true,
+  default: {
+    type: 'formula',
+    // name,
+    uiSchema: {
+      type: 'number',
+      // title,
+      "x-disabled": true,
+      'x-component': 'Formula.Result',
+      'x-component-props': {
+        stringMode: true,
+        step: '1'
+      }
+    }
+  },
+  properties: _objectSpread(_objectSpread({}, defaultProps), {}, {
+    'expression': {
+      type: 'string',
+      title: '{{t("Expression")}}',
+      required: true,
+      description: '{{t("Input +, -, *, /, ( ) to calculate, input @ to open field variables.")}}',
+      'x-component': 'Formula.Expression',
+      'x-decorator': 'FormItem',
+      'x-component-props': {
+        'supports': ['number', 'percent'],
+        'useCurrentFields': '{{ useCurrentFields }}'
+      }
+    },
+    'uiSchema.x-component-props.step': {
+      type: 'string',
+      title: '{{t("Precision")}}',
+      'x-component': 'Select',
+      'x-decorator': 'FormItem',
+      required: true,
+      default: '0',
+      enum: [{
+        value: '0',
+        label: '1'
+      }, {
+        value: '0.1',
+        label: '1.0'
+      }, {
+        value: '0.01',
+        label: '1.00'
+      }, {
+        value: '0.001',
+        label: '1.000'
+      }, {
+        value: '0.0001',
+        label: '1.0000'
+      }, {
+        value: '0.00001',
+        label: '1.00000'
+      }]
+    }
+  }),
+  filterable: {
+    operators: operators.number
+  }
+};

package/es/collection-manager/interfaces/index.d.ts

@@ -10,9 +10,13 @@ export * from './icon';
 export * from './id';
 export * from './input';
 export * from './linkTo';
+export * from './m2m';
+export * from './m2o';
 export * from './markdown';
 export * from './multipleSelect';
 export * from './number';
+export * from './o2m';
+export * from './o2o';
 export * from './password';
 export * from './percent';
 export * from './phone';
@@ -24,3 +28,4 @@ export * from './textarea';
 export * from './time';
 export * from './updatedAt';
 export * from './updatedBy';
+export * from './formula';

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

@@ -10,9 +10,13 @@ export * from './icon';
 export * from './id';
 export * from './input';
 export * from './linkTo';
+export * from './m2m';
+export * from './m2o';
 export * from './markdown';
 export * from './multipleSelect';
 export * from './number';
+export * from './o2m';
+export * from './o2o';
 export * from './password';
 export * from './percent';
 export * from './phone';
@@ -23,4 +27,5 @@ export * from './subTable';
 export * from './textarea';
 export * from './time';
 export * from './updatedAt';
-export * from './updatedBy';
+export * from './updatedBy';
+export * from './formula';

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

@@ -13,6 +13,7 @@ export var linkTo = {
   group: 'relation',
   order: 1,
   title: '{{t("Link to")}}',
+  description: '{{t("Link to description")}}',
   isAssociation: true,
   default: {
     type: 'belongsToMany',
@@ -93,17 +94,17 @@ export var linkTo = {
       'x-component': 'Select',
       'x-disabled': '{{ !createOnly }}'
     },
-    through: {
-      type: 'string',
-      title: '{{t("Junction collection")}}',
-      'x-disabled': '{{ !createOnly }}',
-      'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
-      'x-decorator': 'FormItem',
-      'x-component': 'Select',
-      'x-component-props': {
-        placeholder: '{{t("Leave it blank, unless you need a custom intermediate table")}}'
-      }
-    },
+    // through: {
+    //   type: 'string',
+    //   title: '{{t("Junction collection")}}',
+    //   'x-disabled': '{{ !createOnly }}',
+    //   'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
+    //   'x-decorator': 'FormItem',
+    //   'x-component': 'Select',
+    //   'x-component-props': {
+    //     placeholder: '{{t("Leave it blank, unless you need a custom intermediate table")}}',
+    //   },
+    // },
     // 'reverseField.uiSchema.title': {
     //   type: 'string',
     //   title: '{{t("Reverse field display name")}}',

package/es/collection-manager/interfaces/m2m.d.ts

@@ -0,0 +1,2 @@
+import { IField } from './types';
+export declare const m2m: IField;

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

@@ -0,0 +1,251 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { uid } from '@formily/shared';
+import { cloneDeep } from 'lodash';
+import { defaultProps, recordPickerSelector, recordPickerViewer, relationshipType } from './properties';
+export var m2m = {
+  name: 'm2m',
+  type: 'object',
+  group: 'relation',
+  order: 6,
+  title: '{{t("Many to many")}}',
+  description: '{{t("Many to many description")}}',
+  isAssociation: true,
+  default: {
+    type: 'belongsToMany',
+    // name,
+    uiSchema: {
+      // title,
+      'x-component': 'RecordPicker',
+      'x-component-props': {
+        // mode: 'tags',
+        multiple: true,
+        fieldNames: {
+          label: 'id',
+          value: 'id'
+        }
+      }
+    },
+    reverseField: {
+      interface: 'm2m',
+      type: 'belongsToMany',
+      // name,
+      uiSchema: {
+        // title,
+        'x-component': 'RecordPicker',
+        'x-component-props': {
+          // mode: 'tags',
+          multiple: true,
+          fieldNames: {
+            label: 'id',
+            value: 'id'
+          }
+        }
+      }
+    }
+  },
+  schemaInitialize: function schemaInitialize(schema, _ref) {
+    var readPretty = _ref.readPretty,
+        block = _ref.block;
+
+    if (readPretty) {
+      schema['properties'] = {
+        viewer: cloneDeep(recordPickerViewer)
+      };
+    } else {
+      schema['properties'] = {
+        selector: cloneDeep(recordPickerSelector)
+      };
+    }
+
+    if (['Table', 'Kanban'].includes(block)) {
+      schema['x-component-props'] = schema['x-component-props'] || {};
+      schema['x-component-props']['ellipsis'] = true;
+    }
+  },
+  initialize: function initialize(values) {
+    if (values.type === 'belongsToMany') {
+      if (!values.through) {
+        values.through = "t_".concat(uid());
+      }
+
+      if (!values.foreignKey) {
+        values.foreignKey = "f_".concat(uid());
+      }
+
+      if (!values.otherKey) {
+        values.otherKey = "f_".concat(uid());
+      }
+
+      if (!values.sourceKey) {
+        values.sourceKey = 'id';
+      }
+
+      if (!values.targetKey) {
+        values.targetKey = 'id';
+      }
+    }
+  },
+  properties: _objectSpread(_objectSpread({}, defaultProps), {}, {
+    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: 'string',
+                  title: '{{t("Source collection")}}',
+                  'x-decorator': 'FormItem',
+                  'x-component': 'SourceCollection',
+                  'x-disabled': true
+                }
+              }
+            },
+            col12: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                through: {
+                  type: 'string',
+                  title: '{{t("Through collection")}}',
+                  description: '{{ t("Generated automatically if left blank") }}',
+                  'x-decorator': 'FormItem',
+                  'x-disabled': '{{ !createOnly }}',
+                  'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
+                  'x-component': 'Select',
+                  'x-component-props': {
+                    allowClear: true
+                  }
+                }
+              }
+            },
+            col13: {
+              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',
+                  'x-disabled': '{{ !createOnly }}'
+                }
+              }
+            },
+            col22: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                foreignKey: {
+                  type: 'string',
+                  title: '{{t("Foreign key 1")}}',
+                  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 }}'
+                }
+              }
+            },
+            col23: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {}
+            }
+          }
+        },
+        row3: {
+          type: 'void',
+          'x-component': 'Grid.Row',
+          properties: {
+            col21: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {}
+            },
+            col22: {
+              type: 'void',
+              'x-component': 'Grid.Col',
+              properties: {
+                otherKey: {
+                  type: 'string',
+                  title: '{{t("Foreign key 2")}}',
+                  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 }}'
+                }
+              }
+            },
+            col23: {
+              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',
+      //   },
+      // },
+    ]
+  }
+};

package/es/collection-manager/interfaces/m2o.d.ts

@@ -0,0 +1,2 @@
+import { IField } from './types';
+export declare const m2o: IField;