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

package/lib/collection-manager/Configuration/schemas/collections.js

@@ -5,8 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.collectionSchema = void 0;
 
+var _react = require("@formily/react");
+
+var _i18n = require("../../../i18n");
+
 var _collectionFields = require("./collectionFields");
 
+var compile = function compile(source) {
+  return _react.Schema.compile(source, {
+    t: _i18n.i18n.t
+  });
+};
+
 var collection = {
   name: 'collections',
   filterTargetKey: 'name',
@@ -197,7 +207,14 @@ var collectionSchema = {
                         drawer: {
                           type: 'void',
                           'x-component': 'Action.Drawer',
-                          title: '{{ t("Configure fields") }}',
+                          'x-reactions': function xReactions(field) {
+                            var i = field.path.segments[1];
+                            var table = field.form.getValuesIn("table.".concat(i));
+
+                            if (table) {
+                              field.title = "".concat(compile(table.title), " - ").concat(compile('{{ t("Configure fields") }}'));
+                            }
+                          },
                           properties: {
                             collectionFieldSchema: _collectionFields.collectionFieldSchema
                           }

package/lib/collection-manager/hooks/useCollectionManager.d.ts

@@ -6,6 +6,7 @@ export declare const useCollectionManager: () => {
     get(name: string): any;
     getCollection(name: any): any;
     getCollectionFields(name: string): any;
-    getCollectionField(name: string): any;
+    getCollectionField: (name: string) => any;
+    getCollectionJoinField(name: string): any;
     getInterface(name: string): any;
 };

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

@@ -11,6 +11,10 @@ var _react = require("react");
 
 var _context = require("../context");
 
+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."); }
@@ -30,6 +34,31 @@ 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,
@@ -57,29 +86,23 @@ 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];
-
-      if (!fieldName) {
-        return;
-      }
-
-      var collection = collections === null || collections === void 0 ? void 0 : collections.find(function (collection) {
-        return collection.name === collectionName;
-      });
-
-      if (!collection) {
+    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 (!(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.length)) {
         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] ? (0, _shared.clone)(interfaces[name]) : null;

package/lib/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/lib/collection-manager/index.js

@@ -3,11 +3,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  useCollectionFilterOptions: true,
+  useSortFields: true
+};
+Object.defineProperty(exports, "useCollectionFilterOptions", {
+  enumerable: true,
+  get: function get() {
+    return _actionHooks.useCollectionFilterOptions;
+  }
+});
+Object.defineProperty(exports, "useSortFields", {
+  enumerable: true,
+  get: function get() {
+    return _actionHooks.useSortFields;
+  }
+});
+
+var _actionHooks = require("./action-hooks");
 
 var _CollectionField = require("./CollectionField");
 
 Object.keys(_CollectionField).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _CollectionField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -21,6 +40,7 @@ var _CollectionFieldProvider = require("./CollectionFieldProvider");
 
 Object.keys(_CollectionFieldProvider).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _CollectionFieldProvider[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -34,6 +54,7 @@ var _CollectionManagerProvider = require("./CollectionManagerProvider");
 
 Object.keys(_CollectionManagerProvider).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _CollectionManagerProvider[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -47,6 +68,7 @@ var _CollectionManagerSchemaComponentProvider = require("./CollectionManagerSche
 
 Object.keys(_CollectionManagerSchemaComponentProvider).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _CollectionManagerSchemaComponentProvider[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -60,6 +82,7 @@ var _CollectionManagerShortcut = require("./CollectionManagerShortcut");
 
 Object.keys(_CollectionManagerShortcut).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _CollectionManagerShortcut[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -73,6 +96,7 @@ var _CollectionProvider = require("./CollectionProvider");
 
 Object.keys(_CollectionProvider).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _CollectionProvider[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -86,6 +110,7 @@ var _context = require("./context");
 
 Object.keys(_context).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _context[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -99,6 +124,7 @@ var _hooks = require("./hooks");
 
 Object.keys(_hooks).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _hooks[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -112,6 +138,7 @@ var _ResourceActionProvider = require("./ResourceActionProvider");
 
 Object.keys(_ResourceActionProvider).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _ResourceActionProvider[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
@@ -125,6 +152,7 @@ var _types = require("./types");
 
 Object.keys(_types).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _types[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,

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

@@ -37,7 +37,7 @@ 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/lib/collection-manager/interfaces/chinaRegion.js

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

package/lib/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/lib/collection-manager/interfaces/components/index.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ThroughCollection = exports.TargetKey = exports.SourceKey = exports.ForeignKey2 = exports.ForeignKey1 = exports.ForeignKey = void 0;
+
+var _antd = require("antd");
+
+var _react = _interopRequireDefault(require("react"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var TargetKey = function TargetKey() {
+  return /*#__PURE__*/_react.default.createElement("div", null, "Target key");
+};
+
+exports.TargetKey = TargetKey;
+
+var ThroughCollection = function ThroughCollection() {
+  return /*#__PURE__*/_react.default.createElement("div", null, "Through collection ", /*#__PURE__*/_react.default.createElement(_antd.Switch, {
+    size: 'small',
+    defaultChecked: true,
+    checkedChildren: "Auto fill",
+    unCheckedChildren: "Customize"
+  }));
+};
+
+exports.ThroughCollection = ThroughCollection;
+
+var SourceKey = function SourceKey() {
+  return /*#__PURE__*/_react.default.createElement("div", null, "Source key");
+};
+
+exports.SourceKey = SourceKey;
+
+var ForeignKey = function ForeignKey() {
+  return /*#__PURE__*/_react.default.createElement("div", null, "Foreign key ", /*#__PURE__*/_react.default.createElement(_antd.Switch, {
+    size: 'small',
+    defaultChecked: true,
+    checkedChildren: "Auto fill",
+    unCheckedChildren: "Customize"
+  }));
+};
+
+exports.ForeignKey = ForeignKey;
+
+var ForeignKey1 = function ForeignKey1() {
+  return /*#__PURE__*/_react.default.createElement("div", null, "Foreign key 1 ", /*#__PURE__*/_react.default.createElement("a", null, "\u65B0\u5EFA"));
+};
+
+exports.ForeignKey1 = ForeignKey1;
+
+var ForeignKey2 = function ForeignKey2() {
+  return /*#__PURE__*/_react.default.createElement("div", null, "Foreign key 2 ", /*#__PURE__*/_react.default.createElement("a", null, "\u65B0\u5EFA"));
+};
+
+exports.ForeignKey2 = ForeignKey2;

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

@@ -32,7 +32,16 @@ var datetime = {
       }
     }
   },
-  properties: _objectSpread(_objectSpread({}, _properties.defaultProps), _properties.dateTimeProps),
+  properties: _objectSpread(_objectSpread(_objectSpread({}, _properties.defaultProps), _properties.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: _properties.operators.datetime
   }

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

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

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

@@ -0,0 +1,83 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formula = void 0;
+
+var _properties = require("./properties");
+
+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; }
+
+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({}, _properties.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: _properties.operators.number
+  }
+};
+exports.formula = formula;

package/lib/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/lib/collection-manager/interfaces/index.js

@@ -160,6 +160,32 @@ Object.keys(_linkTo).forEach(function (key) {
   });
 });
 
+var _m2m = require("./m2m");
+
+Object.keys(_m2m).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _m2m[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _m2m[key];
+    }
+  });
+});
+
+var _m2o = require("./m2o");
+
+Object.keys(_m2o).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _m2o[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _m2o[key];
+    }
+  });
+});
+
 var _markdown = require("./markdown");
 
 Object.keys(_markdown).forEach(function (key) {
@@ -199,6 +225,32 @@ Object.keys(_number).forEach(function (key) {
   });
 });
 
+var _o2m = require("./o2m");
+
+Object.keys(_o2m).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _o2m[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _o2m[key];
+    }
+  });
+});
+
+var _o2o = require("./o2o");
+
+Object.keys(_o2o).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _o2o[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _o2o[key];
+    }
+  });
+});
+
 var _password = require("./password");
 
 Object.keys(_password).forEach(function (key) {
@@ -340,4 +392,17 @@ Object.keys(_updatedBy).forEach(function (key) {
       return _updatedBy[key];
     }
   });
+});
+
+var _formula = require("./formula");
+
+Object.keys(_formula).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _formula[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _formula[key];
+    }
+  });
 });

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

@@ -23,6 +23,7 @@ var linkTo = {
   group: 'relation',
   order: 1,
   title: '{{t("Link to")}}',
+  description: '{{t("Link to description")}}',
   isAssociation: true,
   default: {
     type: 'belongsToMany',
@@ -103,17 +104,17 @@ 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/lib/collection-manager/interfaces/m2m.d.ts

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